Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: include new assets.txt file in make upgrade #32860

Merged
merged 8 commits into from
Jul 27, 2023

Conversation

UsamaSadiq
Copy link
Member

@UsamaSadiq UsamaSadiq commented Jul 27, 2023

Description

  • PR build: npm run build (experimental) #32823 introduced two new Python requirements files assets.in and assets.txt. Since these files were not included in the make upgrade target, it broke both the Upgrade Requirements and Upgrade one dependency workflows due to requirements conflicts when upgrading packages.
  • Including these files in the make upgrade target will fix both of the failing jobs as well as make upgrade target running locally.

Testing

  • Tested the change by successfully running Requirements Upgrade workflow build against this branch.

@UsamaSadiq UsamaSadiq marked this pull request as ready for review July 27, 2023 08:38
@@ -429,22 +430,22 @@ edx-auth-backends==4.1.0
# openedx-blockstore
edx-braze-client==0.1.7
# via -r requirements/edx/bundled.in
edx-bulk-grades==1.0.1
edx-bulk-grades==1.0.2
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This package looks ok.

# via
# -r requirements/edx/kernel.in
# staff-graded-xblock
edx-ccx-keys==1.2.1
# via -r requirements/edx/kernel.in
edx-celeryutils==1.2.2
edx-celeryutils==1.2.3
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This package looks ok.

# via
# -r requirements/edx/kernel.in
# edx-name-affirmation
# super-csv
edx-codejail==3.3.3
# via -r requirements/edx/kernel.in
edx-completion==4.2.1
edx-completion==4.3.0
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks ok

# via -r requirements/edx/kernel.in
edx-django-release-util==1.2.0
edx-django-release-util==1.3.0
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It has migration due to django40

@UsamaSadiq UsamaSadiq merged commit 34f9fc4 into master Jul 27, 2023
@UsamaSadiq UsamaSadiq deleted the update-make-upgrade-command branch July 27, 2023 11:03
@edx-pipeline-bot
Copy link
Contributor

2U Release Notice: This PR has been deployed to the edX staging environment in preparation for a release to production.

@kdmccormick
Copy link
Member

My mistake, thanks for the fix @UsamaSadiq !

@edx-pipeline-bot
Copy link
Contributor

2U Release Notice: This PR has been deployed to the edX production environment.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants